* term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.

diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 5fe8ab51c50c65f4f8aab4f2b1ed981f5ccba76c..0d89f9d15ca9813b9074bac80242e993314e901d 100644 (file)
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-06-18  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
+
 2007-06-12  Juanma Barranquero  <lekktu@gmail.com>
 
        * server.el (server-process-filter): Fix typo in docstring.